From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 31 Mar 2010 00:05:35 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~19^2~25^2~24
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6ed3b0e18ba2524866fa027a97ef323cac59461a;p=emacs.git

Merge from mainline.
---

6ed3b0e18ba2524866fa027a97ef323cac59461a